Update copyright and watch file

diff --git a/debian/copyright b/debian/copyright
index c9e26808521ab23d5d5353f7819f789ea28ee547..f4531af4b06c085160b7ac29684d033d3260cc43 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,15 +2,21 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: PCL
 Upstream-Contact: http://pointclouds.org/contact.html
 Source: http://pointclouds.org/downloads/
+Files-Excluded: cuda/common/include/pcl/cuda/cutil*.h
+                gpu/utils/include/pcl/gpu/utils/device/cutil_math.h
+                registration/include/pcl/registration/ia_fpcs.h
+                registration/include/pcl/registration/impl/ia_fpcs.hpp
+                registration/include/pcl/registration/matching_candidate.h
 
 Files: *
 Copyright: 2009-2012, Willow Garage, Inc.
-          2012-2014, Open Perception, Inc.
+          2012-2016, Open Perception, Inc.
 License: BSD-3-clause
 
 Files: debian/*
 Copyright: 2013, Thomas Moulard <thomas.moulard@gmail.com>
           2014, Leopold Palomo-Avellaneda <leo@alaxarxa.net>
+          2014-2016, Jochen Sprickerhof <jspricke@debian.org>
 License: GPL-2
  See `/usr/share/common-licenses/GPL-2'.
 
@@ -23,6 +29,56 @@ Files: apps/point_cloud_editor/*
 Copyright: 2012, Texas A&M University
 License: BSD-3-clause
 
+Files: cuda/segmentation/include/pcl/cuda/segmentation/mssegmentation.h
+         cuda/segmentation/src/mssegmentation.cpp
+Copyright: 2000-2008, Intel Corporation
+         2009, Willow Garage Inc.
+License: BSD-3-clause
+
+Files: features/include/pcl/features/brisk_2d.h
+         features/include/pcl/features/impl/brisk_2d.hpp
+         keypoints/include/pcl/keypoints/brisk_2d.h
+         keypoints/include/pcl/keypoints/impl/brisk_2d.hpp
+         keypoints/src/brisk_2d.cpp
+Copyright: 2012-, Open Perception , Inc.
+         2011  The Autonomous Systems Lab (ASL), ETH Zurich,
+         Stefan Leutenegger, Simon Lynen and Margarita Chli.
+License: BSD-3-clause
+
+Files: filters/include/pcl/filters/impl/crop_box.hpp
+         filters/src/crop_box.cpp
+Copyright: 2009-2011, Willow Garage, Inc.
+         2012-, Open Perception, Inc.
+         2015, Google, Inc.
+License: BSD-3-clause
+
+Files: io/include/pcl/io/hdl_grabber.h
+         io/include/pcl/io/vlp_grabber.h
+         io/src/hdl_grabber.cpp
+         io/src/vlp_grabber.cpp
+         visualization/tools/vlp_viewer.cpp
+Copyright: 2012-, Open Perception, Inc.
+         2012,2015 The MITRE Corporation
+License: BSD-3-clause
+
+Files: ml/include/pcl/ml/impl/svm/svm_wrapper.hpp
+         ml/include/pcl/ml/svm.h
+         ml/include/pcl/ml/svm_wrapper.h
+         ml/src/svm.cpp
+         ml/src/svm_wrapper.cpp
+Copyright: 2010-2012, Willow Garage, Inc.
+         2000-2012 Chih-Chung Chang and Chih-Jen Lin
+License: BSD-3-clause
+
+
+Files: registration/include/pcl/registration/impl/incremental_registration.hpp
+         registration/include/pcl/registration/impl/meta_registration.hpp
+         registration/include/pcl/registration/incremental_registration.h
+         registration/include/pcl/registration/meta_registration.h
+Copyright: 2015, Michael 'v4hn' Goerner
+         2015-, Open Perception, Inc.
+License: BSD-3-clause
+
 Files: tools/tiff2pcd.cpp
 Copyright: 2012 KU Leuven 
           2010-2012, Willow Garage, Inc

diff --git a/debian/watch b/debian/watch
index ebb3e795b17055ea7a8fc41dd285ef1f35b68f4e..30567a6fe59a140637a92917cfe38a005d17e295 100644 (file)
--- a/debian/watch
+++ b/debian/watch
@@ -3,6 +3,6 @@ version=3
 #opts=uversionmangle=s/(\d)[_.+-]?((RC|rc|pre|dev|beta|alpha)[\d.]*)$/$1~$2/ \ 
 #https://github.com/PointCloudLibrary/pcl/releases .*/pcl-(\d\S*)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
 
-opts="uversionmangle=s/(\d)[_.+-]?((RC|rc|pre|dev|beta|alpha)[\d.]*)$/$1~$2/" \
+opts="repacksuffix=+dfsg,uversionmangle=s/(\d)[_.+-]?((RC|rc|pre|dev|beta|alpha)[\d.]*)$/$1~$2+dfsg/" \
 https://github.com/PointCloudLibrary/pcl/releases .*/pcl-(\d\S*)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))